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

Change-Id: I477e4e79a369707f6518a0d9793b9881c7622154