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

Change-Id: I81535fbcc8d0a5a7b5365910317c160ca89f322c