Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de am: f0714847 am: 251bbcbf Change-Id: I56ac87b28c26d178adaebb60457a4d3359a8d27a