[automerger skipped] Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e am: 950cbfe797
am: 3eb90474dc -s ours
am skip reason: subject contains skip directive

Change-Id: Idceb8402399e808a58cd2be47f9fdd5753fe43b2