Potential SSL fixes.

Change-Id: If12977a4a191e291dce47c49a547958fe3bed5ca