Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev