Merge "[pm] return original error message for abi install failures" into sc-dev