Merge "Keystore 2.0: Legacy support: Tweak to certificate generation."