[automerger skipped] Merge "API Council Feedbacks" into rvc-dev am: 28ab493385 -s ours

am skip reason: Change-Id Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754 with SHA-1 9ae1afee27 is in history

Change-Id: I416ecf21a9d7485df01915336e3513487e8a565a