[automerger skipped] Merge "Address aosp/1199568 leftover comments" into rvc-dev am: 928c1ea8 -s ours am: e2593af5 -s ours
am skip reason: Change-Id I6e4f16e70b290ce6a3566b92e5946c65075971a1 with SHA-1 fc142de7 is in history
Change-Id: I81f93e0e695ed82599209f0e689a136d0898089e