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

* commit '1492d22a3d84bc95dc06e99417790b0453c281d4':
  Fix the run-as environment to better match su.