Merge "Fix opening PEM files in CertInstaller" am: f30a6dc610
am: 30403a4208

Change-Id: Ie4b1fa9ff7463278cee9ccb9bff84453634f448c