Merge "Set proper sdk_version"