Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am:...
Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855 am: e676c5e0 am: c153373b am: c355787c
am: 4b452deb
Change-Id: I73e9c944b603571f312dffd24c483da154379b9f