Merge "Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: e9e59912cc" into rvc-qpr-dev-plus-aosp