Moved to new config

Change-Id: f7ff177cb1