updating with latest cfg agent code

Change-Id: I8b79d08c61308bff7c7d470b484ab774fa9d7da3