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

Change-Id: Iee29d5925fa35db7b33df0e65c95fccff6e2e2f8