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

Change-Id: I11ba8386da5ac50447ebc14e50609549c7b60a36