Merge "Add "do not kill" install option" into nyc-dev am: 6958226 am: 61c24de
am: bb06e14

* commit 'bb06e146c59231e36fd62127205248f39c056a23':
  Add "do not kill" install option

Change-Id: Id87a7fd4cc1489773d207ff65635d982f532913d