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

Change-Id: I96283fd4245fffa0b40c9f52cabeba7b5d48ea89