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

* commit 'b81dcd5a3e9508def58a7f79a110d37ca27aebf9':
  Remove circular dependency.