Rename null provider to manual provider.

Cherry pick of @castrojo's fix for null provider