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

Change-Id: I72bec6393f49ebe7e12405670b2f8525693af49f