[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de -s ours am: 955ce640 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 e03ec757 is in history
Change-Id: I85efeb46d61dc130acc77ddc8cadba8014bb920b