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

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

Change-Id: I4f91e3ac286ce02885089ac63cd0201f996b53c9