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

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