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

* commit '82a42a25e3e7dceefdca41096ce6e768f285076c':
  Doc update: emulator bug fix