Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev