Merge "run-as: improve diagnostics on failure."