am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev

* commit 'e431e6a352125f2c51507130cc64e3405625a7ec':
  Add logging to try and track down bug 7643792