Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394cf9
am: 49ac59197a

* commit '49ac59197aa35eafcb7f24bf6bf6332a49a0b9e9':

Change-Id: I9a54c8d213c921979ae361c30cde1c6f7f2f2804