Merge "keystore_cli_v2: Add support for testing against v0.3."
am: 187b8f7a07

* commit '187b8f7a07abbcaa4f870499e2c0af8ac64b6cfb':
  keystore_cli_v2: Add support for testing against v0.3.