Merge "More changes to fix PDK build:"