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

* commit '7f4c45a92ef7875fa4ae54179722ff4e48975a75':
  bootctl: Fix the error checking for strtol result.