Merge "diag: Update new diag logging codes"