am e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev

* commit 'e47539684e1431a69893e45bcf9ace4f812edbc8':
  Remove old KeyStore call sites