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

* commit '5ec0bb4c233998e6c4f39dd0a3c906d9a3d214ad':
  Change display Strings to CharSequence (1/3)