Merge "diag: Add status field in response packet"