added support for tenderloin and d2spr

Change-Id: I95afec5502f3f59207e4e1d48ab7033bea886621