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

Change-Id: I29c05d48902e0b7ae14d82a5d6c9830bca78d688