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

Change-Id: I4e7c6de52ee06214def1e2f470a83d4f23c6ef40