Merge "bootstat: Followup cleanups from the initial bootstat checkin."
am: 17bcba1631

* commit '17bcba163188ae6f7c07b8c56770567740620046':
  bootstat: Followup cleanups from the initial bootstat checkin.