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

Change-Id: Ie89bd5f743d7d829e0ce05fd628b8be222b685fb