More vanir diffs merged in.

Change-Id: Ib0b6b878d602ce7f3503d25bfa3c74959ba886aa