Fix config setup order

Change-Id: I8cb584e6918797d9c7b197d629db7dad08073059