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

Change-Id: I3c079d96e4f8469b3e40eb7e5a9230544c752d57