Merge "MAP: Skip invalid message data"