VSD: import keywords

Change-Id: I1896afdcbec2cb3177f053558b2a6668529bd85e
VSDXMetaData: check token type at a single place

Change-Id: I0318d619a71b0785e2752a363a68f4db0b3acc0e