am ee00b31a: Merge "Use private key context when necessary" into jb-dev

* commit 'ee00b31a54cc186cb53fe30d7834361791baab20':
  Use private key context when necessary