Merge "Uncanonicalize URIs before comparing them." into pi-dev
am: 467a831aa6

Change-Id: Ibe0197543af68f937baa4dae768bbc64d34370e4