Merge "Add a dedicated function to dump incident report" am: 90b4d05627 am: e4713cf49c
am: 365d4fd22b

Change-Id: If2271cbcee38d8b22109e1819dfb8928d1f141af