Fix stack use after scope. am: ad1f992b27 am: af47e0b0bf
am: 69f351e2ac

Change-Id: I97b60c470f5c3dbdf3cd91047e387dee6c4304f9