Merge "adb: improve CHECKs." am: 9f38e19b88
am: f628362478

Change-Id: I4d381032b4dfbca95a203473af4fcc6164b1fca8