Merge "Provider side changes for exposing data usage stats" into jb-mr2-dev