Merge "Fix adb."