Merge \\\"Add UIDs for system DNS and tethering DNS\\\" am: c4dc4f3fc2 am: fcf3ed51dc
am: 9f31416013

Change-Id: I2ad186412133603a36d91801737d15d4441d4956