[automerger skipped] Address further API council comments. am: 47ce6894cc am: 150ebad774 -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 b0e1e7ec3e is in history
Change-Id: I0a0cae7327fd84f078e1027840a86b1db090d9c3
This commit is contained in: