Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab99 am: f543f7ffc1

Original change: undetermined

Change-Id: Ie073af9204def3cc7bfbc9b9435cd65df443428f