Merge "Properly implement requestIdToMessageId map" into ub-gmail-ur14-dev