Merge changes from topic "libprocessgroup"
am: 830f837231

Change-Id: Icb325b97b2177538a2bcada2cd398f562e8f7da1