Fix up vanir_d802

Change-Id: I2410529b0ff026667b4e07e0f36f7bf57740642f
Fix up vanir_vs980

Change-Id: If8953722b0f84330ee80385b73034dc098cb8b24