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

Change-Id: I6cf9a21a0c4e548df2e15d1e25f3515b8a12da12