Merge "Move over to CharSequence version of badging method." into lmp-dev