Vanirize

Change-Id: I0e732c99c7028f598cdbc52b3833bcd5502aa0a7