Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
tree: b1c724904462f222bbe07014206b1464a0ff30f7
  1. core/
  2. services/
  3. tests/