Merge "Move Calendar to /product" am: faf91459ac
am: 6037344914

Change-Id: Iabe6fe63e0848a912172be46a00ad579721ebf0f