97b5660c97
Merge commit '9fbeb7da1318bf5b65588a759332d74540306c06' * commit '9fbeb7da1318bf5b65588a759332d74540306c06': Change the keystore APIs.