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

Change-Id: I57f173c10d04c6eff249755b1046ea6f8864094d