Merge "adb: turn off fastdeploy." am: 82f0e7dad8
am: 90aadf880d

Change-Id: I0791f4abaa08d6e080a60cb2271e583c37d91716