Fix defconfig for codina
Merge branch '3.0.31-plus' into 3.0.31-plus_oc