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

Change-Id: Icaeffaa67c3cc5c2452843b92577dd7bdab01146