Merge "b/5064464 Fixed the problem where the attendee and reminder queries were returning dups."