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

* commit '7142afa92a41a7aad2d0f4a91177532b425b6f0f':
  Upper-case incoming AIDs.