Merge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev
am: bf6c6b44e1

Change-Id: I85b2fabd9f33697be15bccbaf8602fa525012772