Merge "Add debug log for 5914560 and 6383850" into jb-dev