Merge change 25414 into eclair

* changes:
  refactor copy-and-paste email address filtering code. add a column to Calendar.Events contract class.