Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab am: c355787c4c am: 4b452debee am: f5472207b1
am: 60ac960bec

Change-Id: Ieef3da4a190314743488f8add28aba285fdfda29