Lower the sdk version for now so the build doesn't fail
Merge branch 'ollieh-scala'