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

* commit '3fe5e2a13508ba12f3757619732f0810d1750dc2':
  Fix API name