Merge "Update extra repo to oscore jobs"