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

Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442