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

Change-Id: I8e50c05b71d1333f37d579a56f2efed008eff0c8