Merge "bootstat: reboot cold, warm and hard tests failed"
am: ae054903af

Change-Id: I39805b14c6a9e5f9800f2240e2063add1b846877