Merge "Fix use-after-free of stack-allocated temporary string." am: 4bcccdf998  -s ours am: 7ec963f00b  -s ours am: 3cb9fc6b74  -s ours
am: 99ca20c708  -s ours

Change-Id: Ib28c036e143350944b134470097188a4fd809eca