Merge "diag: Change implementation of diag log masks"