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

Original change: undetermined

Change-Id: I9a2704421608984faa8d610af219b47dfc6dd1ae