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

Change-Id: I501465f42c9f476637df652633d006e950d45c8a