Merge "Fixing engineGetCertificateChain exception"
am: 09e3d8c3eb

Change-Id: I89f4c025671e8ae2092ff45e1bac47d676feeb7d