Merge "Avoid using SSLv3 in tests" am: 6d7ae7b0fc am: 32e3f8e4bf am: b70d201b7f
am: 0e3fa88eea

Change-Id: I2a2519a15d8f561ac213a3f6245cb755bcd89bf6