Merge "Reenable logging." into lmp-dev