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

Change-Id: I9f3397d46e97b5e8ae5754dfc3dc13682c3e2547