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

Change-Id: I8628eed7510087ab5c27f86915f4360faec9d6d1