generalize some normalizations for recurring msgs

Change-Id: I3da844e5099fc6d7fc3d6d6e33c33540987265d5
Merge "generalize some normalizations for recurring msgs"