Workaround for mobile DNS

Change-Id: I2f2a3500c5aa507d1875bb64db0214ee2a5a0755