Fix MwEmbedSupport message groups

Change-Id: Icbf73c6d5b736a7aaff3df6b1f9dba080bb43914