Update MassMessage to master

Change-Id: I23e847de826a3cf6e3cf13257414559ef7f6e432