defconfig final fixes

Change-Id: I17a18f31acc36705cc2cc0dbedec411bb9e150e4