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

Change-Id: I093734ef8caaf09d497c82fcc21d1ea46e5c856a