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

* commit 'afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
  DO NOT MERGE: Don't log passwords returned from vdc