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

Change-Id: I91b08c2b5f05afbae16d842d0dcc13994c5418f4