Merge "Logs to track bug 6765842." into jb-dev