Merge "update descriptor-packages build process"