Only interested in vigor and grouper

Change-Id: Ic7cb42db7575b12bfccb232147410e301a06225a
Add Calendar

Change-Id: I1d4242df80fb84fc835813c72d8ce4224a34e705