Merge changes from topic 'am-ffdf163382234d40a4d305b203191a53'

* changes:
  Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8 am: 83a4419e46
  AID suffix registration. am: 68f719e196 am: 243294170b