Merge \\"When uninstalling, only kill the requested user.\\" into nyc-dev am: 060d5a0e0a
am: eaa1c9ae42

Change-Id: Ifb9552c07ed4a055908e8c2e118eec2ff6ae4640