Merge "Address nit from aosp/1301317" into rvc-dev