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

Change-Id: I4d163e042f2ee48a2e6acb0463c784e704e56813