am 02a43d3a: Merge "Add debug for tracking down connectivity issues." into jb-dev

* commit '02a43d3adf8a0b43503f5e266ca332fc1ba23ccc':
  Add debug for tracking down connectivity issues.