Merge "Merge "Fix potential use-after-free issue" into rvc-dev am: 557bdaa8d2 am: 282b2897ed am: 5319e2d1a7" into rvc-qpr-dev-plus-aosp