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

Change-Id: Iee060280ca126fa692f0f4178209046b96bd77e8