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

Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6