am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
  Doc update: emulator bug fix