Add Aroma

Change-Id: If689b21d8d1a60c6a973191ddae48430420b5434