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

Change-Id: I69a2e79e97ab7a1dada6194fc8dd5235ad35bea8