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

Change-Id: Id0a62ed28833785a831286575ef52de9383adf78