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

Change-Id: I690b9d81b1d3c72c9df3134d7ad92153cf3c9c5c