Merge "Fix emulator" into jb-mr1-dev