Merge "Fix bad merge of aosp/1220298" into rvc-dev