Updated to latest cfg agent code

Change-Id: I1e6e6c5c3a630b4f4e56f0c10aa690d798d1d0b4