endeavoru: shuffle-reshuffle and permissions

Change-Id: I281170d4d4ce206bc7205403ce29d9edbdb4c5f2