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

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