Merge "Doc update: emulator bug fix" into jb-mr1.1-docs