fuji/board: fixup recent commits
Merge branch 'cm-10.2' into jb-devel-mr2