Merge "Add AID_EVS for use by the Automotive EVS system"