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

Change-Id: I96380a7e3e750d6326489f29f8b21b8d9e4bdd51