added support for tenderloin and d2spr

Change-Id: I795961b2dac371a6af23e62ff51db5182b21bd29