Merge "adb: improve CHECKs."