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

* commit '325e71b960fdc197865476eb9e698969dfc61712':
  Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: I90d37a0e2e873734e50306a23d20e1cea73986bb