Merge "adb: hopefully deflake test_adb.py." am: 151499e47e
am: ad68f429ca

Change-Id: Id7527280afd0cb2400231dd9ac24281e517a0c6e