Merge "Validate AIDs when registered."