Bug 1023664 - Calendar modularization part 2
Bug 1023664 - Calendar modularization part 3