Merge "bootstat: Two changes to aid in debugging TimeSinceFactoryReset." am: a348dfc
am: 6da6ad9

* commit '6da6ad9ffa98b548b61fcee344b7174f270befd6':
  bootstat: Two changes to aid in debugging TimeSinceFactoryReset.

Change-Id: I2d56fd25e817a63962ea4855432fc023914c244b