Merge "Update fix for issue 147928666. am: bb1d95a0 am: b23e9c13 am: 1a3f0b9b" into rvc-qpr-dev-plus-aosp