Merge "Add comments according to the API review process." am: e9a215b238
am: b3b458b9ad

Change-Id: Ie9c3ce9bc67c08d99ea1c1ebfce5fbc78575baea