[automerger skipped] Update comments for doc comments. am: c434923fba
am: 9a6d59289e  -s ours

Change-Id: I25b5102b4cc2a5f8fa0eea467883d2b2f9f2d1a4