Merge "Prevent unnecessary database queries in ExchangeService"