am 22900e4e: am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev

* commit '22900e4e8dbee3d02bca1fc3bed5f7a7205596e3':
  Change display Strings to CharSequence (1/3)