Merge "Delete empty bugreport files onError" into rvc-dev am: 873f59dc am: 8abcebf3 am: 24598b6a Change-Id: I8c238843465ec2f3d400f76fe8e7b5231bfda5de