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

Change-Id: I7ea58e8c3b292b39ccc3b9814303cd72683c1314