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