[automerger skipped] Merge "API Council Feedbacks" am: e03edaba -s ours am: 34e7fd41 -s ours am: 4a221551 -s ours am: 073bb25d -s ours am: c920838a -s ours

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

Change-Id: Ia7e0577c00bfb3358a209e4475edf99a2e0727d6