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

Change-Id: I4f062a6c92f32c0ee38e277c05060d7d8b2c3f77