Merge "Fix static AID prefix registration." into lmp-dev