Merge "sdk: remove whitelist for deployagent" am: 73fae42b6f
am: 313307b0b1

Change-Id: I33b38189dc387521738f10025a824b226a9ce738