Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410
am: ddc32a5239

Change-Id: Ice0c3f3b944bc05121a529ecd2b000d9d1e9b6c4