Merge "Fix keystore_cli_v2"
am: 22076b3aad

Change-Id: Ie2529101b0f38f7692e39cebfe8aade2c7f398d5