Merge "Fix breaking NetworkUsageStats CTS" into mnc-dev