Merge "Set message id in notification redaction activity" into nyc-mr1-dev