Merge changes from topic "merge-unique-id" into sc-v2-dev

* changes:
  Update keymaster_tests for unique ID generation
  Improve UNIQUE_ID generation