Improve CalendarDataUtils. am: dc4414b90a am: 8dffe25c7c am: 77ac9e0fd8
am: ef9ae54117

Change-Id: Id9f4bb757e4afd554f6b60961ac82470227686c5