Merge "Fix the run-as environment to better match su." am: 83f33e6c93 am: 1492d22a3d
am: 329caf97ed

* commit '329caf97ed732a5782c9fab83721de820f445456':
  Fix the run-as environment to better match su.