Merge "Address the comment of aosp/1288493" into rvc-dev