[automerger skipped] Merge "API Council Feedbacks" into rvc-dev am: 28ab4933...
[automerger skipped] Merge "API Council Feedbacks" into rvc-dev am: 28ab4933 am: 022298f7 -s ours
am skip reason: Change-Id Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754 with SHA-1 9ae1afee is in history
Change-Id: Iedcf700ad1cb6e94c14ce40cdce113949d03d8e8