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

Change-Id: Ic1b63e2ca8d772bd483c8f285f41bd4cefbfdcdd