Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev