Merge "libutils cleanup" into jb-mr1-dev