Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s ours" into lollipop-mr1-cts-dev am: fcd60194 -s ours" into marshmallow-cts-dev am: 361ff178 -s ours" into nougat-cts-dev
