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

Change-Id: I63216568d2ec5606fdfe108d0263714238dc1886