Minor improvements on bugreport generation. am: 5f6eacaeda  -s ours
am: 00a2d7f210

Change-Id: Ic27e6e45a31b5d114bf456ee2123f35bf08e350b