Updates code base to build with reboot branch changes