Merge "Fix Revi's mailmap email address"