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