Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev