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

Change-Id: I73359b1e29337faf8fe8f3c8ccc2ca85f7f475e2