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

Change-Id: I9a911cc59e7dd0d784478d8c9ac23cd32c0f10ae