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

Change-Id: I08c12915f9aa6c667ae3cc54e2344a1cf1812006