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