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

Change-Id: I4c30f4f9cd8ac92f38e6640a747227211e7fe528