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

Change-Id: I260480c896f890f67818b85a5916a1a9057a33bf