Merge "Fix potential use-after-free issue" into rvc-dev am: 557bdaa8d2 am: 282b2897ed

Change-Id: I72b754fe9975e81a4bba4e422a4b0dfa8ebff8bd