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

Change-Id: Idcc8acd35a5c93c48998ff709a483dc649a09d72