DO NOT MERGE.  Integrate: Include showmap output in bug report.

Change-Id: I51265eb248b7eba360f0758fa9eb8a01821f108a
3 files changed