Merge "Support NAT keepalives" into oc-mr1-dev