Fixes password string escaping

Change-Id: I570c97a7b217da2b0775b9e049c80a35ecb753f2
Closes-Bug: #1404533