Merge "Fix adb flakiness on reboot" am: f7a1c476ff am: d0dead710b am: e93241e377
am: 7bdbbfb0ef

Change-Id: I717036b04762c293643a4d4bac7bb9342cdfe3df