Add hybrid properties for all d2 variants

Change-Id: I08d3c2b85220bcdcd7d6b5cbded742d6c85867a8