Merge "Made message body duplicate detection customizable"
am: 07a1624c45

Change-Id: I9e1de65d74f55391cc6ae481bc204f5c2a6f1b18