Merge "API Council Feedbacks" into rvc-dev am: cf5dc204 am: 93eeab5c am: 5b9a914c am: 8c6ed50b am: 462d442f Change-Id: I4d163e042f2ee48a2e6acb0463c784e704e56813