Merge "Remove 'hasDns' parameter"
am: 3176e8be7a

Change-Id: I7efc2ff04cf65420b02ddf2cf7a13b640e37ef77