Address further API council comments. am: b0e1e7ec3e am: edd61e038a

Change-Id: If3be20d6baea713086be109b017af2b32f05a99c