[automerger skipped] Merge "provide a resource overlay to configure customized...
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev
am: 27ad19ee -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1 a4d01220 is in history
Change-Id: Ia4a68691a8f7113c9575b4856a47f9c011a21653