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

Change-Id: I5c1715421b672c0514b8020e99696944725eacd6