Merge "JB MR2 == API 18." into jb-mr2-dev