Final updates for SSL Persistence.

Change-Id: I1c81b07994c19c0a1c39866e00ca3a459792031e