Merge "Add a new bugreport error code"
am: 1bed967833

Change-Id: Id99ec17d82435ac3eb108d2bce56cbca8f1140eb