[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: f07148470d am: 251bbcbfc5 am: 5a3c5dfbc7 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 bade48b1b7 is in history
Change-Id: I368ab4a2d9887730660f27e9d95fe0f3afa43659
This commit is contained in: