Merge "configs: guard system property with odm flag."