Merge "Update fix for issue 147928666. am: bb1d95a02e am: b23e9c1375 am: 1a3f0b9b4c" into rvc-qpr-dev-plus-aosp