Merge changes from topic "revert-15398814-TAMEQDKRQU-sc-mainline-prod" into sc-mainline-prod

* changes:
  [DO NOT MERGE] Revert "Change UUID after database upgrade"
  [DO NOT MERGE] Revert "Redefine XATTR_UUID to XATTR_UUID_V2"