Fix so that correct VIF is used for T1.

Change-Id: Ie67157d060986b11d39da92c9be1af6cde34bcc2