Fix configs

Change-Id: I921ee23195cffd75587178522911111158c981fc