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

Change-Id: I4ee93e5096de07bd6140ac752d9e41d352eb0068