Merge "Fixed get packages for HSUM devices" into main