Merge "Update sdk_version to current"