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

Change-Id: I485af7879686965403741aaf399f8ea7a5507c3f