am e643ccba: Merge "Remove circular dependency." into jb-mr1-dev

* commit 'e643ccba8b8476595ab353c9bcecc8863c53242e':
  Remove circular dependency.