am 32c9cd84: am 939def7d: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev am: 978c8728f5

Original change: undetermined

Change-Id: I2240e26ff2f8f7388952390d969e18e5a3863848