Merge "Add new apis to CP2" into jb-mr2-dev