Merge "Update fix for issue 147928666. am: bb1d95a02e am: 889bf0b65f" into rvc-d1-dev-plus-aosp