Merge "Development: remove deployagent" am: 90ceb51d8f
am: 72325edad9

Change-Id: I9adb766eec722d3e2b85a1d0d16a689dc1f7877a