Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev