Merge "Support for dns domain." am: ff31bee14a

Original change: undetermined

Change-Id: I15fc7fdc8b73adae2e64df434099d2b4dea0653d