Merge "bootstat: refine kernel panic details" am: 22a10f6766
am: 088fed7bb5

Change-Id: Ib31381d3eb39867f5e18c00833c02c903e037b70