Merge "add killProcessGroupOnce" am: c8a575588a am: d140cc9bf3
am: cb52d51488

Change-Id: I54d3233c0710b0edff2c23975ce8f5dee756eccb