Merge "MapClientTest reduce FlakyTests"