Synching with full branch to get latest cfgagent changes

Change-Id: I87ccccfed38da46dd44a15c4cff68bff769b88be