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

Change-Id: Iaee3d50541a026870750f4a38eefc53ac926b17f