am a9c5301d: Fix build after cross-key issues broke non privacy enabled builds

* commit 'a9c5301d8dcddedc46f6a713039b60b3cb0e2bf6':
  Fix build after cross-key issues broke non privacy enabled builds