Merge "bootctl: Fix the error checking for strtol result." am: de2ad9750a
am: 60e27741b3

* commit '60e27741b3e235ac490f6d46f1abdfd1d2bc0394':
  bootctl: Fix the error checking for strtol result.