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

Change-Id: If62cfd4199661fbb08727f320961daec63f8e11e