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

Change-Id: Iaefec65b06e5d8d503ab2f4c8fd1f21d41f8dc49