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

Change-Id: I2ad3031fa557227850b0626b24dbb1036737cb47