Merge "keystore_cli_v2 --prompt_text expects a UTF-8 string" into pi-dev