Merge "Address aosp/1274403 leftover comment" into rvc-dev