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

Change-Id: Ie882de906e97938b5c0e336f2e07092a2eebc638