Merge "Add a bugreport mode"
am: 6d4c9406d9

Change-Id: If66f9135549410d27c872a9a068171033cb9e34c