Merge "Add support for tracking PANS data usage"