am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev

* commit '630dfb410afd44c9db401a1679d12aa1edcfcdea':
  Use correct API for badging