Merge "replace apps for PDK" into jb-mr1-dev