Merge "Remove extraneous logs." into jb-mr1-dev