Merge "bootstat: test reboot rescueparty" am: 035a1c7a0b
am: 0bb59a9d57

Change-Id: I07678150969bcd0b82c8356ad2aa5ca335265e1f