Merge "Revert "Move resource related methods to ResourceUtils"" into jb-mr1-dev