Fix use-after-free of stack-allocated temporary string. am: b9beeed5a3  -s ours
am: d2dd3dcbe1  -s ours

Change-Id: I72edf272adf5b8310dc47c370942d6608a31fc1b