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

Change-Id: I4a355ee78ec56cc541ff34a5a107e93b41a72daa