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

Change-Id: Ic90fe7f73ae2442e5bd3c8e7f69e70c1b5332ff6