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

Change-Id: Ifb02659531eae0b7aaadb3b54bb8d02e33b2295c