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

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

Change-Id: I438e486400d00070fd424cb811e578d5f3a1c60d