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

Change-Id: I591c592e64a48f71f5528d999426343977fe48ce