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

* commit '69582262f0dfa8cdca232d03ff3239fa026326ab':
  Add "do not kill" install option

Change-Id: Iabc5d0c0e252c789fa8ad74609c24e7b8998ba5e