Merge "bootstat: Followup cleanups from the initial bootstat checkin."