Cfg agent fixes

Change-Id: I2f44258c9a84b8c849d9916703a9ea259dc0d7d4
RPC modifications

Change-Id: I0479c017c877bc583c4da6190f50896aa795fffd