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

Change-Id: I7d2e0c1a96db2bd6d93463258486c25d233e6bcd