Merge "add killProcessGroupOnce" am: c8a575588a
am: d140cc9bf3

Change-Id: I3eed238ea53e497d3108ea21919522c235e9830a