Merge "Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec am: f821a8a8cf am: 589fef0c40" into rvc-qpr-dev-plus-aosp