Merge "MapClientTest reduce FlakyTests" am: 44021c0e13

Change-Id: I8872e7c6f781cbb3dc4eb6c4ccbcac0c56634c34