Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de -s ours am: 955ce640 -s ours" into rvc-d1-dev-plus-aosp