USE SOME VANIR FILES & MERGES

Change-Id: I47cdd2c3d3dc34af2eba274197fd961b14804769