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

Change-Id: I0619b49943144ef88f5ef9b9bfb6f2f0c1747e1f