Merge "Remove circular dependency." into jb-mr1-dev