Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e
am: 950cbfe797

Change-Id: Id3348f0c2735582b02f6d77f85469abe4e156a1e