am ba1311a3: Merge "Fix API name" into jb-mr2-dev

* commit 'ba1311a3f64efc9f22dea1ab5477002751e478dc':
  Fix API name