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

* commit '29638ab758ec5274b3fbf4974149d1cd05a00bd6':
  Remove old KeyStore call sites