am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev

* commit '2effc77c9a49f983779dbab656bba490bb7d4ba0':
  Update APIs to JB MR1 level 17.