DO NOT MERGE: Minor improvements on bugreport generation.
am: 6e2869680c  -s ours

Change-Id: I1987d9d6336018566f5681523bf3d7e946d7af84