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

* commit 'b0cbe18f06ae1d331d636d2ac157a2d5bf434d8b':
  Use CharSequence for DisplayName