am 7fe2cf88: am adc7bb3f: am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev

* commit '7fe2cf88f658408cb86425606f2a4b424b27e276':
  Revert "Remove String version of getBadgedLabel"