Add Aroma

Change-Id: If689b21d8d1a60c6a973191ddae48430420b5434
Add Calendar

Change-Id: I1d4242df80fb84fc835813c72d8ce4224a34e705