Merge "[VID] Obfuscate truststore password at the entrypoint"