Merge "Documentation updates" into oc-dev am: b8d4a94867
am: 9b4511c643

Change-Id: Ib8d4c116d548b55f395e977ab76bc1f85d9791ba