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

Change-Id: I5f4ef576859a6daa4fd5098871fdefa94d524ee0