Merge "Fix AsyncListUtilTest and ThreadUtilTest."