Merge "Accidentally checked in a line used for debugging. Removing." into lmp-dev