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