Calendar: code cleanup

Change-Id: I4f2f4c26ddbe3c231c2ce814e8fb25f3478069fa
Merge remote-tracking branch 'upstream/kk_mkt' into HEAD