am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev

* commit '3c0a511dee505d46ebab80a9b5a1579d39e597fd':
  Remove class that was moved to a different package.