Merge "Add comments according to the API review process."