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

Change-Id: I73e9c944b603571f312dffd24c483da154379b9f