Merge "Fix SDK build breakage"