Merge "Fix SDK build"