Merge "Fix SDK repo to prevent mixing different targets."