Merge changes from topic 'utf' am: 3a07e5bf94 am: aa7fd8a3ec am: ade3876260
am: 111ef54a28

Change-Id: I8337b6ef144346cfd8337479562e915f90228c3b