Merge "provide a resource overlay to configure customized DNS Server." am: 7db7b331ef
am: c116de19c3

Change-Id: Iba867a3b7bda1f5db9dfa1b7521d4a4badbf88e0