Merge "Turn on message body content duplication detection" into rvc-dev am: dc5ce0e9ad

Change-Id: Ib5c93d934c3a903c166c3795dc0d3f63643e4412