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

Change-Id: I61e98d37cdff9ce9b65820e773c17e9a62c9084a