Address further API council comments. am: 4dd17a5113 am: 07c723bf2a

Change-Id: I17fcbd09d2f6b8881f882b9ce94107e08295d73c