Merge "Give back ownership to the adb module owners"