am ba9ec0a3: am 84bea2dd: Merge "Fix dependency on internal API." into jb-mr2-dev

* commit 'ba9ec0a3c824e252b7a72385cacfeb33bc842fc2':
  Fix dependency on internal API.