Merge tag 'armsoc-defconfig' into test-merge