Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
am: 54677a86d4

Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba