am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev

* commit '15af6c4e0717b49b84ea32159fea7e4b7ceb48a6':
  Upper-case incoming AIDs.