Merge "Remove legacy bugreport flow code"