Merge "Update Simulator to launch SpeakEasy" am: b762f47975
am: bdb18aa5f6

Change-Id: I3ed9fbb12ff7eebc20b07310c41a3116da5a2878