fix agents key error
Merge remote-tracking branch 'upstream/master' into x-plat_dev