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

Change-Id: I02e6de2b6a3b3ce4c5b8508320c58e43fc2621c9