Merge "Add metrics for dropped messages"