board cleanup
Merge remote-tracking branch 'kfire/cm-10.2' into cm-10.2