Merge "adb: disable checksum on new versions" am: 578a564994
am: b9b168bdad

Change-Id: Id3cbe70d8dedc053b42fdf5d0b8763d31d0d1564