Merge "Add logging const for smart setting suggestion enabled/disabled state" into oc-mr1-dev