Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf -s ours am: da3462e366 -s ours
am: 61c338ee9a -s ours
Change-Id: Ic0fecc9e155deb05883fa3cdb645b4540060d655
This commit is contained in: