Merge "Add "do not kill" install option" into nyc-dev am: 6958226
am: e671e2c

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

Change-Id: I50d870a74f2ad2056373d590b5704a96b637d15e