Merge "bump up expected version to 4.2 and SDK to 17" into jb-mr1-dev