Merge "Don't import removed namespaces." into udc-d1-dev