am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

* commit 'fc1e84777c957bb094f793f8d286e873d070e7e0':
  Use CharSequence for DisplayName