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
* commit '49ac5919':
Change-Id: I9a54c8d213c921979ae361c30cde1c6f7f2f2804