Merge "Add more logging for bug 6499508 (getting warmer!)" into jb-dev