Merge "Trigger bugreport for device error" into tm-dev