Merge commit '8d61d005839b23a41034325d5f458f1344933b1b' into eclair-plus-aosp * commit '8d61d005839b23a41034325d5f458f1344933b1b': Fix the removal of dns entries.
Merge commit '8d61d005839b23a41034325d5f458f1344933b1b' into eclair-plus-aosp * commit '8d61d005839b23a41034325d5f458f1344933b1b': Fix the removal of dns entries.