Merge "Updates based on API council guidance." into oc-dev am: 3ba7117164
am: e13d60764c

Change-Id: Ib0a727b11cc24c20d10adf9df85df100f603a87f