Merge in Vanir diff

Change-Id: Iad12b0915bb2026cef090bb5ccb543716cda3974