[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5 am: cc8ffc96c0 -s ours am: 3868bfe5c0 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history
Change-Id: I843010994a1ea4e9db259405f4b10f68f43d03ee
This commit is contained in: