Address API council comments.

Bug: 123587501
Test: Manual
Change-Id: I72582ca6d8da8b1fe7bc4fc1b4b4db1fad6ca7a7
2 files changed