Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3
am: dd6d0918c4

* commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33':
  Fix incorrect hasPerDomainConfigs check