Vanirize

Change-Id: I9e08c1fd152997bc26489b9e9a95239ebb327254