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

Change-Id: I0b7736485a21e69d58ab262993132599ee261628