Merge "Adding an index for Vms Layer Subtype Will rename ID to type in another CL so messages include Type and Subtype instead of Id and subtype."