Merge "Fix keystore_cli_v2" am: 22076b3aad
am: 8b0e874ac5

Change-Id: I50ecf50761f8b3441e4cf2ac09e256f73855bb20