Vanirize

Change-Id: Icf37b0ac178fd519aeed97151ac9687a13178926