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