Merge "Don't drop shell permissions before running test." into sc-dev