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

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

Change-Id: Ibe29773316cef0ccc15585d67eae1646b240325f