Merge "Upper-case incoming AIDs." into lmp-dev