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

Change-Id: I38d6608f64076ffa3300255eb66c51c32e590b0f