Docs: Emulator-related updates am: 09af67aaa3
am: ded388c739

Change-Id: I6feb5a982f4f28581bdbcf2744d0abd53d194f05