Merge "intel: Refactor common platform code [5/5]" into integration