Merge changes from topic "libprocessgroup_json"
am: 4bb7b18fe1

Change-Id: Idd640ed97ef2d1d62325ccca73386d562db038d4