Merge "update docs per API council" into oc-dev am: e28cccab24
am: 62fc9fd7e7

Change-Id: I187df43e72344e73e1c3d9572a3d692a284ca51b