Maintenance for new messages

Change-Id: Ia24eea21e0744f8a2101f4ccb40ae9f0505de5a8