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

Change-Id: I71df758a2cf7f9310459311b5e41f6a2a382c037