am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target