Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset."