Merge changes from topic "libprocessgroup" am: 830f837231
am: 98d4fc0d13

Change-Id: I626fd8b82c190cdb85e369414d052a946abb731f