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

Change-Id: Ie56d32f17d3b84d608505d0ae79e7ed7c2dd5632