Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into...

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 am: 2f13f5f5 -s ours am: 9bcd52ca -s ours

am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 bade48b1 is in history

Change-Id: Iab189d69fcc0fbf1d08686a2cfae3ea59eda8e56