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

Change-Id: I17693eb30b93a910db1ad4cda049dd0c737110d3