Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev