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

Change-Id: Ia512c8c229c27e8048cb09b7e316eac363527201