Add two messages that were not delivered to client side

Change-Id: I7ae2953db67b2d2e0c2744613aec28618b64f138