Calendar modularization again with unit test fixes
Merge pull request #23695 from gaye/calendar-modularization-redux

Calendar modularization again with unit test fixes