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

Change-Id: I798cd1f965c87d1e5f3c32a47a181623bda36b37