Merge "Fix adb flakiness on reboot"