am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

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