Run pki init conditionally

Running pki initialization conditionally, run it by default
for backwards compatibility.

Change-Id: I42f839574309d4ba5dcbfe1482c6c41bf0cf6cd1
Merge "Run pki init conditionally"