am fbf8886: am 119c75d: AI 147660: Fixes for tests in the security modul

Merge commit 'fbf888693006c4135f61f7113dab80af44241681'

* commit 'fbf888693006c4135f61f7113dab80af44241681':
  AI 147660: Fixes for tests in the security module.