Merge "[automerger skipped] Merge "Uncanonicalize URIs before comparing them." into pi-dev am: 467a831aa6 am: bd02d45b52  -s ours"