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
am: 45bdc82def

Change-Id: I31d4c8237de0616d97ef46926a49d9cfcfca3b33