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

Change-Id: Idab9ab137f11023049eb1d5b9097d76133a4fc27