defconfigs: Some more changes

Change-Id: Iced60b0729779b302f02f673d55aa713f0582b4b