Merge "Fix sdk build"