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

* commit '61c24ded75ab7f5f4c5b650b22f66f3ad5a6e21c':
  Add "do not kill" install option

Change-Id: I8d67cd442be7d53d145231f6d613c7eb0c8817ec