Fix keystore

Change-Id: I4488e672e9d3e80f62ec032b0330fde0c9ea97ee
Fix keystore

Change-Id: Ia0b3344924814142e331919a6c2bb9fe75ebbf66
Merge commit '2b5de27cb8a59a14a8b23f4e25e59e6491d67cb7'
Merge commit 'b775882ae42ef64a82dcf9104e8aa5804f8fbe47'