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

Change-Id: I16944d09649bbd4fd5cd492522560f101c6376ad