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

Change-Id: Ia67000e838c4629dfc014248ed01d6747673ba27