Merge "Move UriCodec to be near its one user" am: 55d8b54ac3
am: 3b3a29e316

Change-Id: Icd6edcce578401741ccfad364d0eec0bcc0eff36