Merge "Development: remove deployagent"
am: 90ceb51d8f

Change-Id: Ie8e878868c681902616859fb280b2bd232b294f1