Updates based on API council guidance. am: 9f75401bb8
am: 3cc7577383

Change-Id: I72814a27ad1ed5e87d679253389419618af0cefe