Merge "Add reboot to build"