Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev
am: 03a5cb51c8

Change-Id: I87342ac5836c4aa698552be70f75e9d5f5ac114c