Hack to ignore do_dhcp failures am: e427c93477 am: 5e95ea0d9f
am: 59c3a4968c  -s ours

Change-Id: I0e5249e197a0bc5367703b12ac146f99876a55da