Merge "Update multi-launch tests to support watch." into nyc-mr1-dev am: a0e8848796 am: 792bc281e5 am: a9cb72bc33
am: 287a893a30

Change-Id: I819a08cd9207f152d4ead17be6a0057a83ae9d9a