Merge "Update Simulator to launch SpeakEasy"
am: b762f47975

Change-Id: I107fd24f1c79f678fca7f14de195dd7eaf3ec7f0