Merge "Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)"