Merge "Remove unused statistics code." into jb-dev