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

* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
  Doc update: emulator bug fix