defconfigs: Reapply some changes

Change-Id: I7e2a11c9b9e281132fd82ce7b52888d5f37cff4a