[automerger skipped] Update comments for doc comments. am: 913c071391 am: d0a4e7f40a  -s ours
am: 5154e5578c  -s ours

Change-Id: I02981279627281d6a202d54202badd79bd1caf97