Merge \\\"Faster and cleaner way to obtain UTF-8 encoded form.\\\" am: 98b4f07dfc am: 5e8b2c9207
am: e000bb9be6

Change-Id: I145e78f5a16c10c9bf645476f71222a5ef8ab448