Merge "Clean up Connectivity Logging." into lmp-dev