[automerger] Make dnsmasq more stable. am: f25df86146 am: 284fd86f87 am: 31b84030c5 am: d774c6e919

Change-Id: Ifc3bcb0d578fedfb7e284bb74be50307654685eb