Merge "allow optionally skipping of initial launch" into nyc-dev
am: 2c7d670933

* commit '2c7d670933e0e0f7f6a83c4353519511faaf4a2f':
  allow optionally skipping of initial launch

Change-Id: I2597a935ddd856ab8dc6857cbb987d7ba5063455