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

* commit '8585e0dd4c7cf7b883de9cd40dc81099abe246c4':
  Use CharSequence for DisplayName