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

Change-Id: I9c3c4da8626f675d9831a6eb790463e6e382382e