Merge "Fix PDK build"