Merge changes from topic "libprocessgroup_json"
am: 9a406fb9b0

Change-Id: I2affe1b197438dfbaff380bd2924e0a3fa3e7d6c