Merge "DO NOT MERGE Use correct lock when killing processes" into pi-dev
am: b4190776a7

Change-Id: I4d22467c3b5353e184dbd54cb64f7c880c3ef39b