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

Change-Id: Ief5cbf3780d33ca127671be979e8c0f8381dc621