Merge "Check network info for metering state on AccessPoint." into oc-dev