Merge "diag: Update event and log ranges of diag masks"