Merge "Turn off dbg messages, be prepared for production build" into jb-mr1-dev