Merge "Add a bugreport mode" am: 6d4c9406d9
am: cb21cef50f

Change-Id: I7730e79f32028985dd3755ed41c036d220223174