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

Change-Id: Ie5c718cb182572e26cc9cfe3aaba1ffda4456106