[automerger skipped] Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 am: ddc32a5239
am: de7e778057 -s ours
am skip reason: subject contains skip directive

Change-Id: I42af1ce6b572304180d03685ca5f04b536f85ebe