Merge changes from topic "Backport: tag availability checking mechanism" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Add null checking to fix NullPointerException while creating mock tag 2p: d52c4c3e
  Add null checking to fix NullPointerException while creating mock tag
  [automerge] Add tag availability checking mechanism 2p: 113f3a4a
  Add tag availability checking mechanism