[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: f07148470d -s ours am: fdaf1ca35d -s ours am: c32bcd6bba -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 e03ec757ee is in history
Change-Id: I7783b979772828729513a94b2ad4a2958f142f72
This commit is contained in: