[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: f07148470d -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 e03ec757ee is in history
Change-Id: I18d2bd8063a82e1311248d88c08863beae4ca959
This commit is contained in: