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

Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb