Merge "Fix potential use-after-free issue" into rvc-dev am: 557bdaa8d2 am: 43c67d5cce am: 779a958f1a am: 3eb6538633

Change-Id: I106a342337d030ee8a56e3a97d0c77cbe71fb8c3