(2/2) Expand to custom Aroma per device

Change-Id: Iad09a801a308323564fc8a885228b362f643b866