Merge changes from topic "libprocessgroup_json" am: 4bb7b18fe1
am: bf3cecfea1

Change-Id: Idd7aa654faa938363c83ee5db0e55f3777b94757