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

Change-Id: Id384cf35574ccd2311f63027632ab3e4a8c94034