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

Change-Id: Ied96769f098fabf57aca6970b2f57a399373a9ab