Merge "Fix adb not correctly reading return code from DeployAgent"