Merge "Adding more logging for bug: 6499508" into jb-dev