Merge "Show pid+uid in certain failures"