Solve errors after upstream merge

Some configs were gone for unclear reasons

Change-Id: Ice2d31917329b8f1358f032536c10aec5308ea75