[DO NOT MERGE] Handle config override via settings correctly
am: aa5ba4f75f

Change-Id: Ie59a563376da91177cc2a600f76a126e260923b4