Merge "Zen: Changes to support new automation settings sub-section."