Updates based on API council guidance.
am: 9f75401bb8

Change-Id: Ifed97998d49fa48eb6d907e63b6e33965d3b45e5