Merge "Fix ConfigAwareConnectionPoolTest" am: 9ac02268c4 am: e6d915d78e am: 37d6cd8f77
am: 554d12c942

Change-Id: I2de9ca7bd9bfd40eca5d1611691cc9e648abe51f