Merge changes from topic 'utf'
am: 213f015932

Change-Id: I12341504ac649cf8ea4558ed2ae882e3dcdce7fd