Merge "bootstat: test: duration fixes" am: 5126ce99de
am: b684bd4e6a

Change-Id: Icfa22bb6d0fa5cef4ca2dba3f412399a30e0eafb