Merge "Keystore 2.0 engine: Handle legacy PEM certificates."