Merge "Revert^2 "[PM] Remove wear folder and the usage of xz-java"" into main