Merge "bootstat: add reboot,rescueparty" am: 708364e650
am: d44f72ddb5

Change-Id: I3c9aab04ee860b467e7a10d3c83c2ddd021ddecd