Merge changes from topic "libprocessgroup_json" am: 9a406fb9b0
am: 049d6b4b7b

Change-Id: Ib29b3ada01b6fdc293ed154ed52f019bee8ad4f7