Merge "Avoid breaking on dead launch options" into nyc-dev
am: 56ecb64783

* commit '56ecb64783b2637a0ff907c9459a7271881e5963':
  Avoid breaking on dead launch options

Change-Id: Id2f2240d90a57cd20e4c4b4532624b6697306d38