Merge "update SDK to 18" into jb-mr2-dev