Update defconfigs

Change-Id: I07140ca8271bf83d52b4a958f0c283a2eaa65484