Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: f07148470d

Change-Id: I79c1c97736bd7dcc11337c62d86a54aa68349cba