Reconcile defconfig with regulars

Change-Id: Ieb82d356f7d1244a606d309fd3a7b2a358e39c89