Merge "Reduce log spam." into jb-mr1-dev