Merge "[DO NOT MERGE] Handle config override via settings correctly am: dc0f443c am: ac21b9ed" into qt-r1-dev-plus-aosp