Merge "Update to bugreportz" into oc-dev am: c7f335b25a
am: c13d9eef86

Change-Id: I35daa1b50b62f277d65e115060ee9b046a53be2c