Miscellaneous clean-up of provider IDs.

Change-Id: If7b3adf96425f8a655ea9af07b6da27a1a66a6f2
4 files changed