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

* commit '7c805a0e0eb42244438c83678f103c4bb7071a4b':
  Doc update: emulator bug fix