TEZ-1114. Fix encrypted shuffle. Contributed by Rajesh Balamohan.