API updates to match API council recommendations.

Bug: 175763859
Test: Presubmit
Change-Id: If51b4456520cca6c781eec6c8f9467f730edd110
4 files changed