Merge "Re-adopt shell permissions before calling clearOverridesForTest." into sc-dev