Merge changes from topic "api_review" into tm-dev

* changes:
  uwb(api): Address API review comments (2/2)
  uwb(api): Address API review comments (1/2)