Updating MassMessage to tip of 1.23wmf6 branch

Change-Id: I358af3a8251cc2e8fbc5551b60de4a3e7b2d264a