Merge "servicemanager: human descriptions for all errors"