Merge "Use CharSequence for DisplayName" into lmp-mr1-dev