Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev am: 526ab77a51
am: 1251085ac9

Change-Id: Ic9819bcbd816d5387ab76c5273f5b156725c8db3