Merge "Properly remove adb DNS services." am: 7445a87101 am: 75d3bc9875

Change-Id: Ide4cfba8cb654d664a6c8dcf73bb145c2b0b4791