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

Change-Id: Ie153b43c6bc698d8daaf93f3bda1ce589307c6b3