Merge "Keystore 2.0: Add Pure Certificate Entry suport."