am ca250167: (-s ours) Merge "DO NOT MERGE.  Integrate: Include showmap output in bug report." into ics-mr0

* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.