Merge "Fix default DNS not being set on network changes" am: 3b8e7328bd

Original change: undetermined

Change-Id: I0129b294cf060c23fec769ae43e684022653e771