Merge "Stop setting net.dns{1234} system properties."
am: 7552e2de9d

Change-Id: I9b31b281896995943ce8217c3230867db380a841