Merge "Add AID for Virtual Machines" into main