Merge changes from topic 'utf' am: 0a357a1a73
am: de8a6a66f6

Change-Id: If82cb8e885e6a378be2b85ff7dea4c7279758444