Address further API council comments. am: 4dd17a5113 am: 791216d4cc

Change-Id: I0c715f3e5d66f75a568d9a08a175e5ca3a8a61c8