Combines the selection of both relevant config files. Change-Id: Icc7d0add2f0a2ceab5ed715ef8d6b3b6a70ec774