Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev