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

Change-Id: Ie0a88f3b8bdd8c92246255444ab0f569adf50ddc