Merge "API Council Feedbacks" into rvc-dev am: cf5dc204f6 am: 93eeab5cf9 am: 5b9a914c11

Change-Id: Ia7a81f7e12ac98e8538504c1b885c17d224291a9