Merge "Fix adb not correctly reading return code from DeployAgent"
am: 73d03dc804

Change-Id: Icab80491069a33f6377897675268d0b834d57a1c