Merge "Fix typo in aosp/1242602" into rvc-dev