endeavoru: shuffle-reshuffle and permissions Part two

Change-Id: If076d714002458a9ca09740f7912389c9a97ce6b