(1/2)Expand to custom Aroma per device

Change-Id: Ie3b57a715c5aaceda07d181cf4ff5804c1864710