Merge "Up our DNS server support from 2 > 4" am: f345cde69e

Original change: undetermined

Change-Id: I7384411327f7631c50c07a72fb0fdf271aea641e