Merge "Fix handling for partial cdex conversion rejection in multidex"