Merge "adb: relax serial matching rules."