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

Change-Id: I07a545c830828427207474a0bcbc96f9c03a7be3