Merge change Ib5343691 into eclair-mr2

* changes:
  Add account name / type query parameters for calendar Events.