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

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