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

Change-Id: I624b34e97212e692abd8a08065d0b4949765b037