Merge 10.5.A.0.230 & Reorganise Defconfig

Change-Id: I3b2ec4b62b1a39f425eea23672e9b951bcd19643