Merge "bootstat: reduce overall boot time"