[automerger skipped] Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e am: 2a9756bbbf
am: a0f3da03fe -s ours
am skip reason: subject contains skip directive

Change-Id: Ic05db8b34db9a2f875659b33fbbbf936f6d336b9