Merge "Accept the calendar name in addition to the owner as a calendar...
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394c am: 49ac5919
am: e6d7c20a
* commit 'e6d7c20a':
Change-Id: Id8713d244e599466c45b1ee694931a36c9312bfa