Merge "Expose error code for RoR reboot system API"