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

Change-Id: I7dc05af0b63bcc9ee828162a6930834ebe56a699