defconfigs: Various updates

Change-Id: I59126508db6197fb5c40f017bb23e9fe157eb873