[Calendar] Updating headers
Merge remote-tracking branch 'origin/master'
[Calendar] Updating headers