Vanirize some strings

Change-Id: Id767aeec309c42673e597e03ba00556e90af245b