Merge "Add explicit subscription id support to DataUsageController"