Merge "Fix error trace induced by dhcp test actions"