Merge "Add aoc to SettingsToPropertiesMapper." into main