Merge "API Council Feedbacks" into rvc-dev am: cf5dc204 am: 93eeab5c am: 1f536ab9 am: c7904a9e Change-Id: Ib8a103df019619b12c7deb0c43eb3c93ab1187e4