Merge "API Council Feedbacks" am: c4243e05d0

Change-Id: Id00e46566d247083dd010aeff255859f5b632bed