Merge "Workaround adb issue in run-test."