Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb
am: b849d1fe35

Change-Id: I1effce2f98ed7e019b097d7b55316c6a23db4d80