Merge "Validate AID format and length." into klp-dev