New vanir header

submitted by Adrian Grimm

Change-Id: I17c5f33a8ac075686417dce25004a82a58a32b31
Merge "New vanir header" into kk44