Merge "Only allow libconnectivity_native usage on U+"