Merge "Update DataUsageStatColumns" into jb-mr2-dev