am 89e68da5: am af9fbc7f: Merge "Reject invalid AIDs." into klp-dev

* commit '89e68da59eeb5c2919efed201cf960344e1017f9':
  Reject invalid AIDs.