Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev
am: b8097855d3

Change-Id: Icb4af9b86fc63d1118d3ea96f7d2879d5da2726c