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

Change-Id: If8ec970216f9628e38ac4061e0695c3a9e9ec5dc