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

Change-Id: I0021eb87112c0b521074ab10ed97b0595c2caf04