Merge changes from topic 'utf' am: 213f015932 am: 654107c725 am: fac1d16e96
am: 7d941b72fe

Change-Id: I1e63a26947ad16a464d4f7f4729db99d6e4b85b2