Set domain explicitly when getting config options

Change-Id: I710dffeb3a35d82b0ed02c9af4928237b128056a
Merge "Set domain explicitly when getting config options"