Merge branch 'depends/rmk/for-armsoc' into for-3.4/cleanup-and-fixes