Merge "Add debug for tracking down connectivity issues." into jb-dev