Merge "fix PDK build" into jb-mr1-dev