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

Change-Id: I0c0a9d41c2ef44e2d328923cae49be739017596f