Merge "Tests for launch support on default feature" into nyc-mr1-dev am: 5b5cf5a2c7
am: f4ccb09603
am: 26fd0d0b75
Change-Id: I818e179bd0c3d3a75382b668c296f41f3d179a8e
This commit is contained in: