Merge "Fix use-after-free" into oc-dr1-dev
am: 8626cd184b

Change-Id: Ib4666da39710948b86d942136c1fdee4b1b3cfa4