Merge "Delete empty bugreport files onError" into rvc-dev am: 873f59dc0e

Change-Id: I15e242816f24c218ce81d48912f76b1651ceaeb2