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

Change-Id: I91a738228413f1d2a90dfa27483f612fa604a46d