Merge "Fixing engineGetCertificateChain exception" am: 09e3d8c3eb
am: 53187655d0

Change-Id: I32f5a32c751647ac9843015bdea9917c9962dffd