Merge changes from topic "utf8decoder" am: 66805fc98d am: 6ded4af9ca
am: d50f5e2c1f

Change-Id: Ic3813456a964fa7de924c57e66f713439b7ee55a