Fix use-after-free of stack-allocated temporary string. am: c41b838baa am: a5efddda90 am: dbd2ac1202
am: 9c0804bbb0  -s ours

Change-Id: I5115c170d990511a9439fb6c244b07daa48cdc77