Merge "API Council Feedbacks" into rvc-dev am: cf5dc204f6 am: 3ea20ab6ce

Change-Id: Ie33f32a73dfa56af8f74e2af022bf64dff9cb159