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

Change-Id: Ifd39caee9a0dcea1314a3559a69d29ae08f1ce03