Merge "add killProcessGroupOnce"
am: c8a575588a

Change-Id: I5382136149b2d7916fe3d891fe04fd79ade97bb2