Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread