am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev

* commit 'a31aeb6da916e1bc22b25d9ec6940b7cde24ec2f':
  AID prefix registration.