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

Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931