Merge "Docs: Emulator-related updates" into nyc-dev
am: 52a60e7f58

Change-Id: Id699370656f57d9320f4429c52c5a325c3fe74fa