Merge "Revive test script for keystore"
am: 91e439b0e8

* commit '91e439b0e86d42032d8b53200f0f9557d3e7ef17':
  Revive test script for keystore