Merge "Fixing the SDK build"