Merge "Grant shell REBOOT permission"