Merge "diag: Update diag logging mask definitions"