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

Change-Id: I2934cfa1906ac7b71a3918a1cbfe41f273ceaaa5