am 71e3aa2c: am 807fd044: Merge "Validate AID format and length." into klp-dev

* commit '71e3aa2c6cfb875be2cb44268bc53a84ea0fd5ab':
  Validate AID format and length.