Updated cfg agent code

Change-Id: I4aa05373cebacc03a39e6b3b8eee7d09cc01ba7f