Merge "Ignore potential SystemProperties errors when setting net.dns"