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

Change-Id: I194c3f9097370861859425fa606445b482eb2ac6