Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev am: f31cf45e82
am: 8ab5f7f324

Change-Id: Ica24924ff8e5c95bd14114fb0a1d82c21a7d30d4