Merge "New API level 17 for JB MR1." into jb-mr1-dev