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

Change-Id: I2fd344b52674c86d62885504d6130a568831d698