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

Change-Id: Id10bcc14ad837b8a358e8be70f36a6cfc94620ab