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

Change-Id: Ic4c07e7d56f8f78190d7f7e57cad2760b30e90ca