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

Change-Id: I56dfd562bba508295999682a2fed3c2a64283131