Update MassMessage to master

Change-Id: I949eda7081bf7e3beac3fcdd407fb8b8b7a81f5e