[DO NOT MERGE] Handle config override via settings correctly
am: dc0f443cb6

Change-Id: I44fd56396f9866401fcd98bb32da91a8171860aa