Fix stack use after scope.
am: ad1f992b27

Change-Id: I5d88dd98000565678aa975e8711ba59dae650f89