Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6
am: 8f3d266984

Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd