Merge "Remove extraneous logging." into jb-mr2-dev