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

Change-Id: I8de331889690ce0bca2c55ee4fa8e08cee5bc9b6