Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev am: 3afa6a5f86
am: 42e55ea1b4

Change-Id: I842e986b9c294a9f87e1ab9e20cf8cff9c25ac5f