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

Change-Id: I43080dc7922ab6b8b1c61f7a2542dd8cead45bc5