Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev