Merge "Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec am: b33c0181ec" into rvc-d1-dev-plus-aosp