Merge "API Review Feedbacks" am: 3d2b3a11 am: 25693b81 am: 3f7ff13f am: 94cb49a2 am: 9bc01b3e Change-Id: I20b1c048d2d8cf4359f036d43db6f32a3a7c7500