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

Change-Id: Ie0b2103d95492d8d1fce5a623ff1ca7aaef20584