Merge "Fix opening PEM files in CertInstaller" am: f30a6dc610 am: 30403a4208 am: 1bef71b937
am: 487005baae

Change-Id: If0ad0f7182026ba94cfe2221c2297a50b391b410