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

Change-Id: I3071ed44778eac1955ffa40541c2cbae598bfd86