Merge "race condition in libprocessgroup" am: aba081c119
am: 9a7ef4957e

Change-Id: I05705adc808290495807d4d52cf45aebc6cb90dc