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

Change-Id: If3af78ac8c25bacdb63daa4679348e79e13183a1