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

merged from goog/mirror-m-wireless-internal-release
73b0048 Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev