Merge "Fix for sdk builds."