Merge "Ensure self-managed CS can use any URI scheme." into pi-dev am: c3d76c905c
am: 8f87419d91

Change-Id: I1499f4b737a3a59a6c2a95bae1912a0a1758ccf0