Merge "Add Uri tests for IPv6 literal adresses"
am: 3d869fea91

Change-Id: I7b1722c93a24c10cbcae0449d7f8cb2acdefa967