Merge "Reduce emulator logspam" into jb-mr1.1-dev