Merge "bootstat: Disambiguate boot time on encrypted devices."