Merge "Revert of Ifd0c4081a.  Turning off logging." into jb-mr2-dev