Merge "Update mailmap from USERINFO"