Merge "Follow API changes in framework." into jb-mr1-dev