[Calendar] Bug fixing.

* [NABI-RSA] TDIS-6952, TDIS-6954
Merge pull request #307 from wcwang/next

[Calendar] Bug fixing.